Skip to content

Fix force-checkout functionality with fre make checkout-script#790

Merged
singhd789 merged 7 commits intoNOAA-GFDL:mainfrom
singhd789:force-checkout-fix
Mar 30, 2026
Merged

Fix force-checkout functionality with fre make checkout-script#790
singhd789 merged 7 commits intoNOAA-GFDL:mainfrom
singhd789:force-checkout-fix

Conversation

@singhd789
Copy link
Copy Markdown
Contributor

@singhd789 singhd789 commented Mar 19, 2026 •
edited
Loading

Describe your changes

  • change order of function argument force_checkout (force-checkout argument was not in same order in both fremake.py and run_fremake_script.py` and this was causing issues)
  • make force_checkout have default value = False
  • update test to include force_checkout
  • write test to make sure force_checkout is working with fre make all subtool

Issue ticket number and link (if applicable)

n/a

  • fixing a bug where --force-checkout worked with fre make checkout-script but not fre make all

Checklist before requesting a review

  • I ran my code
  • I tried to make my code readable
  • I tried to comment my code
  • I wrote a new test, if applicable
  • I wrote new instructions/documentation, if applicable
  • I ran pytest and inspected it's output
  • I ran pylint and attempted to implement some of it's feedback
  • No print statements; all user-facing info uses logging module

Note: If you are a code maintainer updating the tag or releasing a new fre-cli version, please use the release_procedure.md template. To quickly use this template, open a new pull request, choose your branch, and add ?template=release_procedure.md to the end of the url.

@singhd789 singhd789 requested a review from uramirez8707 March 19, 2026 20:14
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 19, 2026 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 84.15%. Comparing base (3b358f2) to head (8f21fc3).
⚠️ Report is 8 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main     #790   +/-   ##
=======================================
  Coverage   84.15%   84.15%           
=======================================
  Files          71       71           
  Lines        4955     4955           
=======================================
  Hits         4170     4170           
  Misses        785      785
Flag Coverage Δ
unittests 84.15% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
fre/make/fremake.py 95.58% <ø> (ø)
fre/make/run_fremake_script.py 97.14% <ø> (ø)

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3b358f2...8f21fc3. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

uramirez8707
uramirez8707 approved these changes Mar 23, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@uramirez8707 uramirez8707 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this Dana. The code changes look good to me. I will do more testing once the module has been created on GAEA.

ceblanton
ceblanton approved these changes Mar 30, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@ceblanton ceblanton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. If users want a different behavior for --force checkout (to rename, maybe) they can tell us :)

@singhd789
Copy link
Copy Markdown
Contributor Author

singhd789 commented Mar 30, 2026 •
edited
Loading

Looks good. If users want a different behavior for --force checkout (to rename, maybe) they can tell us :)

Thanks Chris! Yeah, I had that thought. 😆

@singhd789 singhd789 merged commit b73b470 into NOAA-GFDL:main Mar 30, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ceblanton ceblanton ceblanton approved these changes

+1 more reviewer

@uramirez8707 uramirez8707 uramirez8707 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@ilaflott ilaflott

@ceblanton ceblanton

Labels

alpha2

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@singhd789 @ceblanton @uramirez8707 @ilaflott